Merge.

diff --cc xen/arch/x86/shadow32.c
Simple merge

diff --cc xen/arch/x86/vmx.c
Simple merge

diff --cc xen/arch/x86/vmx_platform.c
Simple merge

diff --cc xen/arch/x86/x86_32/entry.S
Simple merge